require automake >= 1.9.6 and libtool >= 1.5

diff --git a/autogen.sh b/autogen.sh
index 3765eaf3cb1991fdb3266d2881470071c6f36e9f..265fb19d79d67c2c3d51c55b9eca792528efe581 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,9 +16,8 @@ AUTOMAKE=${AUTOMAKE-automake-1.9}
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 
 AUTOCONF_REQUIRED_VERSION=2.54
-AUTOMAKE_REQUIRED_VERSION=1.7.9
-LIBTOOL_REQUIRED_VERSION=1.4
-LIBTOOL_WIN32=1.5
+AUTOMAKE_REQUIRED_VERSION=1.9.6
+LIBTOOL_REQUIRED_VERSION=1.5
 
 
 PROJECT="BABL"
@@ -79,16 +78,6 @@ echo
 DIE=0
 
 
-OS=`uname -s`
-case $OS in 
-    *YGWIN* | *INGW*)
-       echo "Looks like Win32, you will need libtool $LIBTOOL_WIN32 or newer."
-       echo
-       LIBTOOL_REQUIRED_VERSION=$LIBTOOL_WIN32
-       ;;
-esac
-
-
 echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
 if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
    LIBTOOLIZE=$LIBTOOLIZE
@@ -129,18 +118,15 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=$AUTOMAKE
    ACLOCAL=$ACLOCAL
+elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.11
+   ACLOCAL=aclocal-1.11
 elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.10
    ACLOCAL=aclocal-1.10
 elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.9
    ACLOCAL=aclocal-1.9
-elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.8
-   ACLOCAL=aclocal-1.8
-elif (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.7
-   ACLOCAL=aclocal-1.7
 else
     echo
     echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."